* xterm.c (x_delete_terminal): Plug file descriptor leak.

Fixes: debbugs:17691

diff --git a/src/ChangeLog b/src/ChangeLog
index 9369ee25cca48a737f7264b726d797fd163fe281..2c5001e9a5ab27fb512a404d6f7b1c4fde0fe720 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * xterm.c (x_delete_terminal): Plug file descriptor leak (Bug#17691).
+
 2014-08-07  Reuben Thomas  <rrt@sc3d.org>
 
        Refer to MS-DOS using the same name everywhere.

diff --git a/src/xterm.c b/src/xterm.c
index 4ec38cfc5c6c2f9d817641485bb71adfb161c07c..7b8d32a45160d802b1d7023d03b5ec59fb2cdd59 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -11329,7 +11329,10 @@ x_delete_terminal (struct terminal *terminal)
 
   /* No more input on this descriptor.  */
   if (0 <= dpyinfo->connection)
-    delete_keyboard_wait_descriptor (dpyinfo->connection);
+    {
+      delete_keyboard_wait_descriptor (dpyinfo->connection);
+      emacs_close (dpyinfo->connection);
+    }
 
   /* Mark as dead. */
   dpyinfo->display = NULL;